]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
Revert "texture-cache: Use image-missing image when no other icon was loaded"
authorFlorian Müllner <fmuellner@gnome.org>
Wed, 25 Mar 2020 15:40:47 +0000 (16:40 +0100)
committerGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>
Thu, 26 Mar 2020 18:36:02 +0000 (18:36 +0000)
The commit broke StIcon's :fallback-gicon property, as it relies on failure to load
an icon to determine that the fallback should be shown.

Luckily StIcon is the only user of st_texture_cache_load_gicon() (at least in
regular shell code), so we'll be able to implement the 'image-missing' fallback
there.

This reverts commit 3dd8ffc2bb1cefd603bcadabd8886dda3192dbd5.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1127

src/st/st-texture-cache.c

index adffafabaa5a58a77d59beb87998bd51ba9ca4d2..850c0d697948bf942fdc9b16ce3a9ae217dcbf1b 100644 (file)
@@ -34,8 +34,6 @@
 #define CACHE_PREFIX_FILE "file:"
 #define CACHE_PREFIX_FILE_FOR_CAIRO "file-for-cairo:"
 
-#define IMAGE_MISSING_ICON_NAME "image-missing"
-
 struct _StTextureCachePrivate
 {
   GtkIconTheme *icon_theme;
@@ -996,15 +994,7 @@ st_texture_cache_load_gicon (StTextureCache    *cache,
                                                    size, scale,
                                                    lookup_flags);
   if (info == NULL)
-    {
-      /* Do not give up without even trying to pick the image-missing fallback icon. */
-      info = gtk_icon_theme_lookup_icon_for_scale (theme,
-                                                   IMAGE_MISSING_ICON_NAME,
-                                                   size, scale,
-                                                   GTK_ICON_LOOKUP_USE_BUILTIN);
-      if (info == NULL)
-        return NULL;
-    }
+    return NULL;
 
   gicon_string = g_icon_to_string (icon);
   /* A return value of NULL indicates that the icon can not be serialized,